lldpd: get_config_cid_ifaces() -> get_interface_csv()

where csv = comma separated value(s)

Make the function more generic. Can use it for not only 'config'.

Now it can be used to parse interfaces for additional lldpd settings,
e.g. custom-tlv.

Tested on: 22.03.6

Signed-off-by: Paul Donald <[email protected]>
Link: https://github.com/openwrt/openwrt/pull/14872
(cherry picked from commit a015f59880c72a1bdd07de32491f85ce7f8d2a1c)
Link: https://github.com/openwrt/openwrt/pull/18344
Signed-off-by: Robert Marko <[email protected]>

diff --git a/package/network/services/lldpd/files/lldpd.init b/package/network/services/lldpd/files/lldpd.init
index 3922b676b52e6904a431ef93fe70f21e8fefb03a..f8de88d4affe46b84fcbe1eacc3d349ed90c4c83 100644 (file)
--- a/package/network/services/lldpd/files/lldpd.init
+++ b/package/network/services/lldpd/files/lldpd.init
@@ -75,9 +75,9 @@ get_config_restart_hash() {
        export -n "$var=$_hash"
 }
 
-get_config_cid_ifaces() {
+get_interface_csv() {
        local _ifaces
-       config_get _ifaces 'config' "$2"
+       config_get _ifaces "$2" "$3"
 
        local _iface _ifnames=""
        # Set noglob to prevent '*' capturing diverse file names in the for ... in
@@ -109,7 +109,7 @@ write_lldpd_conf()
        config_get lldp_hostname 'config' 'lldp_hostname' "$(cat /proc/sys/kernel/hostname)"
 
        local ifnames
-       get_config_cid_ifaces ifnames "interface"
+       get_interface_csv ifnames 'config' "interface"
 
        local lldp_mgmt_ip
        config_get lldp_mgmt_ip 'config' 'lldp_mgmt_ip'
@@ -335,7 +335,7 @@ start_service() {
 
     # ChassisID interfaces
        local ifnames
-       get_config_cid_ifaces ifnames "cid_interface"
+       get_interface_csv ifnames 'config' "cid_interface"
 
        [ -n "$ifnames" ] && procd_append_param command -C "$ifnames"